From f823a38b1fa544e61a337abde6c635841f7f0c60 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 28 Nov 2005 14:08:53 +0100 Subject: [PATCH] arch/xen/kernel/fixup.c -> arch/xen/i386/kernel/fixup.c arch/xen/kernel/devmem.c -> drivers/xen/char/mem.c arch/xen/kernel/smp.c deleted Signed-off-by: Keir Fraser --- .../arch/xen/i386/kernel/Makefile | 2 +- .../arch/xen/{ => i386}/kernel/fixup.c | 0 linux-2.6-xen-sparse/arch/xen/kernel/Makefile | 4 +-- linux-2.6-xen-sparse/arch/xen/kernel/smp.c | 25 ------------------- .../arch/xen/kernel/smpboot.c | 6 +++++ linux-2.6-xen-sparse/drivers/xen/Makefile | 1 + .../drivers/xen/char/Makefile | 2 ++ .../devmem.c => drivers/xen/char/mem.c} | 0 8 files changed, 12 insertions(+), 28 deletions(-) rename linux-2.6-xen-sparse/arch/xen/{ => i386}/kernel/fixup.c (100%) delete mode 100644 linux-2.6-xen-sparse/arch/xen/kernel/smp.c create mode 100644 linux-2.6-xen-sparse/drivers/xen/char/Makefile rename linux-2.6-xen-sparse/{arch/xen/kernel/devmem.c => drivers/xen/char/mem.c} (100%) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/Makefile b/linux-2.6-xen-sparse/arch/xen/i386/kernel/Makefile index 8a565b43b2..d315d94b12 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/Makefile +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/Makefile @@ -11,7 +11,7 @@ extra-y := head.o init_task.o obj-y := process.o signal.o entry.o traps.o \ time.o ioport.o ldt.o setup.o \ - pci-dma.o i386_ksyms.o irq.o quirks.o + pci-dma.o i386_ksyms.o irq.o quirks.o fixup.o c-obj-y := semaphore.o vm86.o \ ptrace.o sys_i386.o \ diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/fixup.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/fixup.c similarity index 100% rename from linux-2.6-xen-sparse/arch/xen/kernel/fixup.c rename to linux-2.6-xen-sparse/arch/xen/i386/kernel/fixup.c diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile index 69b422382e..c77d504f3d 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile +++ b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile @@ -11,8 +11,8 @@ $(obj)/vmlinux.lds.S: extra-y += vmlinux.lds -obj-y := evtchn.o fixup.o reboot.o gnttab.o devmem.o +obj-y := evtchn.o reboot.o gnttab.o obj-$(CONFIG_PROC_FS) += xen_proc.o obj-$(CONFIG_NET) += skbuff.o -obj-$(CONFIG_SMP) += smp.o smpboot.o +obj-$(CONFIG_SMP) += smpboot.o diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/smp.c b/linux-2.6-xen-sparse/arch/xen/kernel/smp.c deleted file mode 100644 index cb1a080250..0000000000 --- a/linux-2.6-xen-sparse/arch/xen/kernel/smp.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2004, Christian Limpach */ - -#include -#include -#include - -/* - * the frequency of the profiling timer can be changed - * by writing a multiplier value into /proc/profile. - */ -int setup_profiling_timer(unsigned int multiplier) -{ - printk("setup_profiling_timer\n"); - return 0; -} - -/* - * Local variables: - * c-file-style: "linux" - * indent-tabs-mode: t - * c-indent-level: 8 - * c-basic-offset: 8 - * tab-width: 8 - * End: - */ diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c index db15eb3dfb..8d9b1531c5 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/smpboot.c @@ -420,6 +420,12 @@ void __init smp_cpus_done(unsigned int max_cpus) { } +int setup_profiling_timer(unsigned int multiplier) +{ + /* Dummy function. */ + return 0; +} + /* * Local variables: * c-file-style: "linux" diff --git a/linux-2.6-xen-sparse/drivers/xen/Makefile b/linux-2.6-xen-sparse/drivers/xen/Makefile index c64941ff4d..f553c5a608 100644 --- a/linux-2.6-xen-sparse/drivers/xen/Makefile +++ b/linux-2.6-xen-sparse/drivers/xen/Makefile @@ -2,6 +2,7 @@ obj-y += net_driver_util.o obj-y += util.o +obj-y += char/ obj-y += console/ obj-y += evtchn/ obj-y += balloon/ diff --git a/linux-2.6-xen-sparse/drivers/xen/char/Makefile b/linux-2.6-xen-sparse/drivers/xen/char/Makefile new file mode 100644 index 0000000000..c73925e4f3 --- /dev/null +++ b/linux-2.6-xen-sparse/drivers/xen/char/Makefile @@ -0,0 +1,2 @@ + +obj-y := mem.o diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c b/linux-2.6-xen-sparse/drivers/xen/char/mem.c similarity index 100% rename from linux-2.6-xen-sparse/arch/xen/kernel/devmem.c rename to linux-2.6-xen-sparse/drivers/xen/char/mem.c -- 2.30.2